(handle_auto_composed_prop): Don't make composition if it->string

is a string.

diff --git a/src/ChangeLog b/src/ChangeLog
index 20f1b129faf52ed826def41b9da19a65ef8e860e..0dc4447a9717e80f0d835f5835aa2e9f668cf5fc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
        * xdisp.c (display_mode_element): Cancel the previous change.
        (decode_mode_spec): Likewise.
+       (handle_auto_composed_prop): Don't make composition if it->string
+       is a string.
 
 2008-02-27  Kim F. Storm  <storm@cua.dk>
 

diff --git a/src/xdisp.c b/src/xdisp.c
index c6ebd596c2d4d938e73023127988a9eb28f255b9..b558c2e8bbb11f0b289c80ddeeafe70dbab7fbc3 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4634,7 +4634,7 @@ handle_auto_composed_prop (it)
                val = Qnil;
            }
        }
-      if (NILP (val))
+      if (NILP (val) && ! STRINGP (it->string))
        {
          if (limit < 0)
            limit = (STRINGP (it->string) ? SCHARS (it->string)